Updated version 0.20.0 from 'upstream/0.20.0'
authorVasudev Kamath <vasudev@copyninja.info>
Sat, 22 Jul 2017 12:01:19 +0000 (17:31 +0530)
committerVasudev Kamath <vasudev@copyninja.info>
Sat, 22 Jul 2017 12:01:19 +0000 (17:31 +0530)
with Debian dir 53c89772334e8917391fa38462c14e600a1a4ffe


Trivial merge